From 64cac40d2ce01aff8211e0c9f5ec670681c50939 Mon Sep 17 00:00:00 2001 From: "Gustavo J. A. M. Carneiro" Date: Sat, 6 Mar 2004 12:46:25 +0000 Subject: [PATCH] fix #136202 (gtk_toolbar_insert_stock crashes if stock lookup fails) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtktoolbar.c | 11 ++++++----- 6 files changed, 36 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 602dabc58b..6861a16c21 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-03-06 Gustavo J. A. M. Carneiro + + * gtk/gtktoolbar.c (internal_insert_element): Check return value + of gtk_stock_lookup; if stock lookup fails, just use stock_id as + label, instead of crashing. Fixes #136202. + 2004-03-05 Federico Mena Quintero * gdk/linux-fb/gdkglobals-fb.c: Make the very first diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 602dabc58b..6861a16c21 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2004-03-06 Gustavo J. A. M. Carneiro + + * gtk/gtktoolbar.c (internal_insert_element): Check return value + of gtk_stock_lookup; if stock lookup fails, just use stock_id as + label, instead of crashing. Fixes #136202. + 2004-03-05 Federico Mena Quintero * gdk/linux-fb/gdkglobals-fb.c: Make the very first diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 602dabc58b..6861a16c21 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +2004-03-06 Gustavo J. A. M. Carneiro + + * gtk/gtktoolbar.c (internal_insert_element): Check return value + of gtk_stock_lookup; if stock lookup fails, just use stock_id as + label, instead of crashing. Fixes #136202. + 2004-03-05 Federico Mena Quintero * gdk/linux-fb/gdkglobals-fb.c: Make the very first diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 602dabc58b..6861a16c21 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2004-03-06 Gustavo J. A. M. Carneiro + + * gtk/gtktoolbar.c (internal_insert_element): Check return value + of gtk_stock_lookup; if stock lookup fails, just use stock_id as + label, instead of crashing. Fixes #136202. + 2004-03-05 Federico Mena Quintero * gdk/linux-fb/gdkglobals-fb.c: Make the very first diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 602dabc58b..6861a16c21 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2004-03-06 Gustavo J. A. M. Carneiro + + * gtk/gtktoolbar.c (internal_insert_element): Check return value + of gtk_stock_lookup; if stock lookup fails, just use stock_id as + label, instead of crashing. Fixes #136202. + 2004-03-05 Federico Mena Quintero * gdk/linux-fb/gdkglobals-fb.c: Make the very first diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c index 51d8180b99..91e7e24d51 100644 --- a/gtk/gtktoolbar.c +++ b/gtk/gtktoolbar.c @@ -3636,12 +3636,13 @@ internal_insert_element (GtkToolbar *toolbar, if (text && use_stock) { GtkStockItem stock_item; - gtk_stock_lookup (text, &stock_item); - - if (!icon) - icon = gtk_image_new_from_stock (text, toolbar->icon_size); + if (gtk_stock_lookup (text, &stock_item)) + { + if (!icon) + icon = gtk_image_new_from_stock (text, toolbar->icon_size); - text = free_me = _gtk_toolbar_elide_underscores (stock_item.label); + text = free_me = _gtk_toolbar_elide_underscores (stock_item.label); + } } if (text) -- 2.30.2